From 40e5e7d043852530da6f512279b3aad84969e4da Mon Sep 17 00:00:00 2001 From: Kevin Cozens Date: Mon, 28 Aug 2006 16:23:45 +0000 Subject: [PATCH] Changes to get 'make distcheck' working properly. 2006-08-28 Kevin Cozens Changes to get 'make distcheck' working properly. * docs/Makefile.am: Added BablFishPath to DISTCLEANFILES. * extensions/Makefile.am: Added. * extensions/Makefile.in: Removed (replaced by Makefile.am). --- ChangeLog | 18 ++++++++--- docs/Makefile.am | 2 +- extensions/Makefile.am | 50 +++++++++++++++++++++++++++++++ extensions/Makefile.in | 68 ------------------------------------------ 4 files changed, 65 insertions(+), 73 deletions(-) create mode 100644 extensions/Makefile.am delete mode 100644 extensions/Makefile.in diff --git a/ChangeLog b/ChangeLog index 6dbbfdd..42066d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2006-08-28 Kevin Cozens + + Changes to get 'make distcheck' working properly. + + * docs/Makefile.am: Added BablFishPath to DISTCLEANFILES. + + * extensions/Makefile.am: Added. + + * extensions/Makefile.in: Removed (replaced by Makefile.am). + 2006-08-25 Michael Schumacher * configure.ac: added AC_LIBTOOL_WIN32_DLL as a preparation for @@ -8,10 +18,10 @@ 2006-08-24 Øyvind Kolås - * extensions/Makefile.in: + * extensions/Makefile.in: do not add libbabl.a into plug-ins 2006-07-06 Øyvind Kolås - + * babl.pc.in: Added -lm to the list of libraries that need to be linked along with babl. @@ -67,8 +77,8 @@ I'm not entirely sure about installing babl-classes.h like this, it might make more sense to create setters/getters to be used. Thus - making it possible to extend the structs at a later stage without breaking - binary compatibility. + making it possible to extend the structs at a later stage without + breaking binary compatibility. * babl/Makefile.am: Added babl-classes.h to the installed headers * babl/babl-classes.h: Made the magic number fit in 32bit int. diff --git a/docs/Makefile.am b/docs/Makefile.am index 1f693e3..4d209c5 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -22,7 +22,7 @@ EXTRA_DIST= \ BUILT_EXTRA_DIST = index.html BablFishPath.html CLEANFILES = README changelog.rss -DISTCLEANFILES = index-static.html +DISTCLEANFILES = index-static.html BablFishPath.txt MAINTAINERCLEANFILES = $(BUILT_EXTRA_DIST) all: $(HTML_FILES) rss diff --git a/extensions/Makefile.am b/extensions/Makefile.am new file mode 100644 index 0000000..64bd496 --- /dev/null +++ b/extensions/Makefile.am @@ -0,0 +1,50 @@ +# General minimalistic compile file for self contained single +# file babl_extensions + +if OS_WIN32 +win32_libs = -lgw32c -liberty -lole32 -luuid -lwsock32 +no_undefined = -no-undefined +endif + +EXTRA_DIST = $(wildcard *.[ch]) + +CFILES = $(wildcard $(srcdir)/*.c) +SOBJS = $(subst $(srcdir)/,,$(CFILES:.c=.so)) + +INSTALLED_ITEMS = $(subst $(srcdir),$(ext_dir),$(CFILES:.c=.so)) + +all-local: $(SOBJS) + +CFLAGS += -I $(top_srcdir)/babl -I $(top_srcdir)/extensions + +LDFLAGS += -shared + +LDADD = $(win32_libs) $(no-undefined) + +%.so: %.c + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) + +# if extension needing external libraries are to be # compiled with this make +# file, each of them can be added according to the this pattern: +# extra.so: extra.c +# $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< [own compile and link flags] + +CIE-Lab.so: CIE-Lab.c + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) -lm +#lcms.so: lcms.c +# $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) `pkg-config lcms --cflags --libs` +############################################################################# + +clean-local: + rm -f $(SOBJS) + +ext_dir = $(DESTDIR)$(prefix)/lib/babl-@BABL_API_VERSION@ + +install-exec-local: all-local + $(INSTALL) -d $(ext_dir) + $(INSTALL) $(SOBJS) $(ext_dir) + +uninstall-local: + rm -f $(INSTALLED_ITEMS) + +check-local: all-local diff --git a/extensions/Makefile.in b/extensions/Makefile.in deleted file mode 100644 index 5318cc5..0000000 --- a/extensions/Makefile.in +++ /dev/null @@ -1,68 +0,0 @@ -# General minimalistic compile file for self contained single -# file babl_extensions - -@OS_WIN32_TRUE@win32_libs = -lgw32c -liberty -lole32 -luuid -lwsock32 -@OS_WIN32_TRUE@no_undefined = -no-undefined - -CC = @CC@ - -CFILES = $(wildcard *.c) -CFLAGS = @CFLAGS@ -SOBJS = $(CFILES:.c=.so) -all: $(SOBJS) - -CFLAGS += -Wall - -%.so: %.c - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) - -# if extension needing external libraries are to be # compiled with this make -# file, each of them can be added according to the this pattern: -# extra.so: extra.c -# $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< [own compile and link flags] - -CIE-Lab.so: CIE-Lab.c - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) -lm -lcms.so: lcms.c - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) `pkg-config lcms --cflags --libs` - - - -############################################################################# -LDFLAGS += -shared - -#LDADD = ../babl/.libs/libbabl.so $(win32_libs) $(no-undefined) -LDADD = $(win32_libs) $(no-undefined) - -CFLAGS += -I../babl - -clean: - rm -f $(SOBJS) -distclean: - rm -f $(SOBJS) Makefile -maintainer-clean: distclean -mostlyclean: - -subdir = extensions -srcdir = @srcdir@ -top_builddir = .. -INSTALL = @INSTALL@ -SHELL = @SHELL@ -ext_dir = @prefix@@libdir@/babl-@BABL_API_VERSION@ - -install: user-install - -user-install: all - $(INSTALL) -d $(ext_dir) - $(INSTALL) $(SOBJS) $(ext_dir) -distdir: - cp $(CFILES) $(Makefile.in) $$distdir - -dvi: - #playing along with automake -check: all - -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) &&\ - $(SHELL) ./config.status $(subdir)/Makefile -- 2.30.2